Auto merge of #2324 - rillian:fixes, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 28 Jan 2016 22:05:50 +0000 (22:05 +0000)
committerbors <bors@rust-lang.org>
Thu, 28 Jan 2016 22:05:50 +0000 (22:05 +0000)
commitf10453840779df28a2c289a48e43039f74540ef8
tree0c45fb245fce20047a286c679a248eedbf167da1
parent7bc508f1b1db384b7c384669350c4aadd9ecc2cf
parent72eaeec0cb72c0eb9a24c66c3e93dbd7dfea85c0
Auto merge of #2324 - rillian:fixes, r=alexcrichton